Merge "Support local cuttlefish instances with mixed vendor_boot.img" am: eb3c30ec2f am: a589f388b2 am: 1ce4850f6b am: fbb08f9ae9 Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/2059349 Change-Id: I9a7da8066137fc632c0985ca796f71e8809b05c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>